From: Nick Roberts <nickrob@snap.net.nz>
Date: Sun, 20 May 2007 08:29:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18791
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=90a984efcb45f57ef5f8a8a14ff7a036d6cc4afe;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eeb041f6de6..56a618a4e05 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
+
+	* t-mouse.el (t-mouse-mode): Reset t-mouse-mode to nil if there
+	is an error.
+
+	* term/linux.el (terminal-init-linux): Don't signal an error
+	if gpm isn't running.
+
 2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
 
 	* t-mouse.el: Reduce to a minor-mode macro call.